mir: use modal window hint

diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 1939e7fb6d09f079974decd40c5bd1d874e4b3cb..386a964635d558788ac7eb79424fd29910c31366 100644 (file)
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -88,6 +88,7 @@ struct _GdkMirWindowImpl
   /* Desired surface attributes */
   GdkWindowTypeHint type_hint;
   MirSurfaceState surface_state;
+  gboolean modal;
 
   /* Current button state for checking which buttons are being pressed / released */
   gdouble x;
@@ -296,6 +297,7 @@ create_window_type_spec (GdkDisplay *display,
                          gint y,
                          gint width,
                          gint height,
+                         gboolean modal,
                          GdkWindowTypeHint type,
                          const MirRectangle *rect,
                          MirEdgeAttachment edge,
@@ -349,6 +351,17 @@ create_window_type_spec (GdkDisplay *display,
   switch (type)
     {
       case GDK_WINDOW_TYPE_HINT_DIALOG:
+        if (modal)
+          return mir_connection_create_spec_for_modal_dialog (connection,
+                                                              width,
+                                                              height,
+                                                              format,
+                                                              parent_surface);
+        else
+          return mir_connection_create_spec_for_dialog (connection,
+                                                        width,
+                                                        height,
+                                                        format);
       case GDK_WINDOW_TYPE_HINT_DOCK:
         return mir_connection_create_spec_for_dialog (connection,
                                                       width,
@@ -421,6 +434,7 @@ create_spec (GdkWindow *window, GdkMirWindowImpl *impl)
                                   impl->transient_for,
                                   impl->transient_x, impl->transient_y,
                                   window->width, window->height,
+                                  impl->modal,
                                   impl->type_hint,
                                   impl->has_rect ? &impl->rect : NULL,
                                   impl->has_rect ? impl->edge : mir_edge_attachment_any,
@@ -1061,8 +1075,15 @@ void
 gdk_mir_window_impl_set_modal_hint (GdkWindow *window,
                                     gboolean   modal)
 {
-  //g_printerr ("gdk_mir_window_impl_set_modal_hint window=%p\n", window);
-  /* Mir doesn't support modal windows */
+  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+
+  if (modal != impl->modal)
+    {
+      impl->modal = modal;
+
+      if (impl->surface && !impl->pending_spec_update)
+        update_surface_spec (window);
+    }
 }
 
 static void